<<<<<<< HEAD
import Vue from 'vue'
import Vuex from 'vuex'

Vue.use(Vuex)

export default new Vuex.Store({
  state: {
  },
  getters: {
  },
  mutations: {
  },
  actions: {
  },
  modules: {
  }
})
=======
import Vue from 'vue'
import Vuex from 'vuex'
import { NavBar } from 'vant';
import {Cell} from 'vant';
import { Icon } from 'vant';
import { Image as VanImage } from 'vant';
import { Popup } from 'vant';
import { Overlay } from 'vant';
import { Search } from 'vant';
import { Tabbar, TabbarItem } from 'vant';

Vue.use(Tabbar);
Vue.use(TabbarItem);
Vue.use(Search);
Vue.use(Overlay);
Vue.use(Popup);
Vue.use(VanImage);
Vue.use(Icon);
Vue.use(Cell);
Vue.use(NavBar);
Vue.use(Vuex)

export default new Vuex.Store({
  state: {
  },
  getters: {
  },
  mutations: {
  },
  actions: {
  },
  modules: {
  }
})
>>>>>>> upstream/master
